From cdafcb42b191316dbbe13e47e7bd4d69f8466756 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Tue, 2 Apr 2002 16:19:33 +0000 Subject: [PATCH] set the sort_func correctly, 77030 Tue Apr 2 11:10:13 2002 Jonathan Blandford * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the sort_func correctly, 77030 --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtkliststore.c | 11 ++++++++--- gtk/gtktreestore.c | 11 ++++++++--- 8 files changed, 40 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3529362fa8..7bc82f6854 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Apr 2 11:10:13 2002 Jonathan Blandford + * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the + sort_func correctly, 77030 + Tue Apr 2 13:44:27 2002 Tim Janik * configure.in: update version to 2.0.2, binary age 2, interface diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3529362fa8..7bc82f6854 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Tue Apr 2 11:10:13 2002 Jonathan Blandford + * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the + sort_func correctly, 77030 + Tue Apr 2 13:44:27 2002 Tim Janik * configure.in: update version to 2.0.2, binary age 2, interface diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3529362fa8..7bc82f6854 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +Tue Apr 2 11:10:13 2002 Jonathan Blandford + * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the + sort_func correctly, 77030 + Tue Apr 2 13:44:27 2002 Tim Janik * configure.in: update version to 2.0.2, binary age 2, interface diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3529362fa8..7bc82f6854 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +Tue Apr 2 11:10:13 2002 Jonathan Blandford + * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the + sort_func correctly, 77030 + Tue Apr 2 13:44:27 2002 Tim Janik * configure.in: update version to 2.0.2, binary age 2, interface diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3529362fa8..7bc82f6854 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +Tue Apr 2 11:10:13 2002 Jonathan Blandford + * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the + sort_func correctly, 77030 + Tue Apr 2 13:44:27 2002 Tim Janik * configure.in: update version to 2.0.2, binary age 2, interface diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3529362fa8..7bc82f6854 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Tue Apr 2 11:10:13 2002 Jonathan Blandford + * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the + sort_func correctly, 77030 + Tue Apr 2 13:44:27 2002 Tim Janik * configure.in: update version to 2.0.2, binary age 2, interface diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index a8bedeecd6..4aaca7df68 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -1914,9 +1914,14 @@ gtk_list_store_set_sort_func (GtkTreeSortable *sortable, for (list = list_store->sort_list; list; list = list->next) { - header = (GtkTreeDataSortHeader*) list->data; - if (header->sort_column_id == sort_column_id) - break; + GtkTreeDataSortHeader *list_header; + + list_header = (GtkTreeDataSortHeader*) list->data; + if (list_header->sort_column_id == sort_column_id) + { + header = list_header; + break; + } } if (header == NULL) diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index e88b92ac59..9d10f986a7 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -2202,9 +2202,14 @@ gtk_tree_store_set_sort_func (GtkTreeSortable *sortable, for (list = tree_store->sort_list; list; list = list->next) { - header = (GtkTreeDataSortHeader*) list->data; - if (header->sort_column_id == sort_column_id) - break; + GtkTreeDataSortHeader *list_header; + + list_header = (GtkTreeDataSortHeader*) list->data; + if (list_header->sort_column_id == sort_column_id) + { + header = list_header; + break; + } } if (header == NULL) -- 2.30.2